Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Android Gradle Plugin を 8.5.0 にアップグレード #133

Merged
merged 13 commits into from
Jul 31, 2024

Conversation

zztkm
Copy link
Contributor

@zztkm zztkm commented Jul 30, 2024

変更内容

  • [UPDATE] Android Gradle Plugin (AGP) を 8.5.0 にアップグレードする
    • Android Studion の AGP Upgrade Assistant を利用してアップグレードされた内容
      • com.android.tools.build:gradle を 8.5.0 に上げる
      • ビルドに利用される Gradle を 8.7 に上げる
      • Android マニフェストからビルドファイルにパッケージを移動する
    • AGP 8.5.0 対応で発生したビルドスクリプトのエラーを手動で修正した内容
    • GitHub Actions で利用する JDK のバージョンを 17 にする
    • JitPack でのビルドで利用する JDK のバージョンを 17 にする

This pull request includes several updates to the build configuration and dependencies for the Android project. The main changes involve upgrading the Android Gradle Plugin, updating the Gradle version, and modifying build scripts to accommodate these upgrades.

Build Configuration Updates:

  • Java Version Update: Changed the Java version from 18 to 17 in the GitHub Actions workflow to align with the default JDK version of Android Gradle Plugin 8.5 and its long-term support. (.github/workflows/build.yml)

  • Gradle Version Update: Updated the Gradle distribution URL from version 7.6.1 to 8.7 in the gradle-wrapper.properties file. (gradle/wrapper/gradle-wrapper.properties)

  • JDK Version for JitPack: Updated the JDK version from OpenJDK 11 to OpenJDK 17 in the jitpack.yml file. (jitpack.yml)

Android Project Configuration:

  • Android SDK Versions Update: Updated compileSdkVersion and targetSdkVersion from 32 to 34 in the build.gradle file. (sora-android-sdk/build.gradle)

  • Build Script Adjustments:

    • Moved compileOptions from buildTypes to the android block.
    • Replaced classifier with archiveClassifier in the sourcesJar task.
    • Added namespace to the android block as required by AGP 8.0. (sora-android-sdk/build.gradle) [1] [2]
    • Removed the package attribute from the Android manifest file. (sora-android-sdk/src/main/AndroidManifest.xml)

Documentation:

  • Changelog Update: Added a detailed entry in CHANGES.md documenting the upgrade to Android Gradle Plugin 8.5.0, including changes to Gradle, build script adjustments, and JDK version updates for GitHub Actions and JitPack. (CHANGES.md)

@zztkm zztkm marked this pull request as ready for review July 30, 2024 09:52
@zztkm zztkm requested a review from miosakuma July 30, 2024 09:52
Copy link
Contributor

@miosakuma miosakuma left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CHANGES に追加の記載を依頼しましたが、細かい内容はコメントに書いてくれているので項目が 1 行あれば大丈夫です

Copy link
Contributor

@miosakuma miosakuma left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

対応ありがとうございました、また、私の環境でもビルドが行えました。
問題ありません。

@zztkm zztkm merged commit a454b86 into develop Jul 31, 2024
1 check passed
@zztkm zztkm deleted the feature/update-gradle-8 branch July 31, 2024 08:17
buildFeatures {
// AGP 8.0 からデフォルトで false になった
// このオプションが true でないと、defaultConfig に含まれている
// buidlConfigField オプションが無効になってしまうため、true に設定する
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo してる...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants